Remove implicit conversion from __value_type to value_type in [unordered_][multi]map. This fixes http://llvm.org/bugs/show_bug.cgi?id=16549 git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@185711 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/include/map b/include/map index 4107ead..953743a 100644 --- a/include/map +++ b/include/map
@@ -381,7 +381,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -template <class _Key, class _Tp, class _Compare, bool = is_empty<_Compare>::value +template <class _Key, class _CP, class _Compare, bool = is_empty<_Compare>::value #if __has_feature(is_final) && !__is_final(_Compare) #endif @@ -389,7 +389,6 @@ class __map_value_compare : private _Compare { - typedef pair<const _Key, _Tp> _CP; public: _LIBCPP_INLINE_VISIBILITY __map_value_compare() @@ -403,22 +402,20 @@ const _Compare& key_comp() const _NOEXCEPT {return *this;} _LIBCPP_INLINE_VISIBILITY bool operator()(const _CP& __x, const _CP& __y) const - {return static_cast<const _Compare&>(*this)(__x.first, __y.first);} + {return static_cast<const _Compare&>(*this)(__x.__cc.first, __y.__cc.first);} _LIBCPP_INLINE_VISIBILITY bool operator()(const _CP& __x, const _Key& __y) const - {return static_cast<const _Compare&>(*this)(__x.first, __y);} + {return static_cast<const _Compare&>(*this)(__x.__cc.first, __y);} _LIBCPP_INLINE_VISIBILITY bool operator()(const _Key& __x, const _CP& __y) const - {return static_cast<const _Compare&>(*this)(__x, __y.first);} + {return static_cast<const _Compare&>(*this)(__x, __y.__cc.first);} }; -template <class _Key, class _Tp, class _Compare> -class __map_value_compare<_Key, _Tp, _Compare, false> +template <class _Key, class _CP, class _Compare> +class __map_value_compare<_Key, _CP, _Compare, false> { _Compare comp; - typedef pair<const _Key, _Tp> _CP; - public: _LIBCPP_INLINE_VISIBILITY __map_value_compare() @@ -433,13 +430,13 @@ _LIBCPP_INLINE_VISIBILITY bool operator()(const _CP& __x, const _CP& __y) const - {return comp(__x.first, __y.first);} + {return comp(__x.__cc.first, __y.__cc.first);} _LIBCPP_INLINE_VISIBILITY bool operator()(const _CP& __x, const _Key& __y) const - {return comp(__x.first, __y);} + {return comp(__x.__cc.first, __y);} _LIBCPP_INLINE_VISIBILITY bool operator()(const _Key& __x, const _CP& __y) const - {return comp(__x, __y.first);} + {return comp(__x, __y.__cc.first);} }; template <class _Allocator> @@ -688,8 +685,6 @@ {__nc = std::move(__v.__nc); return *this;} ~__value_type() {__cc.~value_type();} - - operator const value_type& () const {return __cc;} }; #else struct __value_type @@ -706,11 +701,9 @@ template <class _A0, class _A1> __value_type(const _A0& __a0, const _A1& __a1) : __cc(__a0, __a1) {} - - operator const value_type& () const {return __cc;} }; #endif - typedef __map_value_compare<key_type, mapped_type, key_compare> __vc; + typedef __map_value_compare<key_type, __value_type, key_compare> __vc; typedef typename allocator_traits<allocator_type>::template #ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES rebind_alloc<__value_type> @@ -1407,8 +1400,6 @@ {__nc = std::move(__v.__nc); return *this;} ~__value_type() {__cc.~value_type();} - - operator const value_type& () const {return __cc;} }; #else struct __value_type @@ -1425,11 +1416,9 @@ template <class _A0, class _A1> __value_type(const _A0& __a0, const _A1& __a1) : __cc(__a0, __a1) {} - - operator const value_type& () const {return __cc;} }; #endif - typedef __map_value_compare<key_type, mapped_type, key_compare> __vc; + typedef __map_value_compare<key_type, __value_type, key_compare> __vc; typedef typename allocator_traits<allocator_type>::template #ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES rebind_alloc<__value_type> diff --git a/include/unordered_map b/include/unordered_map index 0d2ce29..78e6307 100644 --- a/include/unordered_map +++ b/include/unordered_map
@@ -325,7 +325,7 @@ _LIBCPP_BEGIN_NAMESPACE_STD -template <class _Key, class _Tp, class _Hash, bool = is_empty<_Hash>::value +template <class _Key, class _Cp, class _Hash, bool = is_empty<_Hash>::value #if __has_feature(is_final) && !__is_final(_Hash) #endif @@ -333,7 +333,6 @@ class __unordered_map_hasher : private _Hash { - typedef pair<const _Key, _Tp> _Cp; public: _LIBCPP_INLINE_VISIBILITY __unordered_map_hasher() @@ -347,18 +346,17 @@ const _Hash& hash_function() const _NOEXCEPT {return *this;} _LIBCPP_INLINE_VISIBILITY size_t operator()(const _Cp& __x) const - {return static_cast<const _Hash&>(*this)(__x.first);} + {return static_cast<const _Hash&>(*this)(__x.__cc.first);} _LIBCPP_INLINE_VISIBILITY size_t operator()(const _Key& __x) const {return static_cast<const _Hash&>(*this)(__x);} }; -template <class _Key, class _Tp, class _Hash> -class __unordered_map_hasher<_Key, _Tp, _Hash, false> +template <class _Key, class _Cp, class _Hash> +class __unordered_map_hasher<_Key, _Cp, _Hash, false> { _Hash __hash_; - typedef pair<const _Key, _Tp> _Cp; public: _LIBCPP_INLINE_VISIBILITY __unordered_map_hasher() @@ -372,13 +370,13 @@ const _Hash& hash_function() const _NOEXCEPT {return __hash_;} _LIBCPP_INLINE_VISIBILITY size_t operator()(const _Cp& __x) const - {return __hash_(__x.first);} + {return __hash_(__x.__cc.first);} _LIBCPP_INLINE_VISIBILITY size_t operator()(const _Key& __x) const {return __hash_(__x);} }; -template <class _Key, class _Tp, class _Pred, bool = is_empty<_Pred>::value +template <class _Key, class _Cp, class _Pred, bool = is_empty<_Pred>::value #if __has_feature(is_final) && !__is_final(_Pred) #endif @@ -386,7 +384,6 @@ class __unordered_map_equal : private _Pred { - typedef pair<const _Key, _Tp> _Cp; public: _LIBCPP_INLINE_VISIBILITY __unordered_map_equal() @@ -400,21 +397,20 @@ const _Pred& key_eq() const _NOEXCEPT {return *this;} _LIBCPP_INLINE_VISIBILITY bool operator()(const _Cp& __x, const _Cp& __y) const - {return static_cast<const _Pred&>(*this)(__x.first, __y.first);} + {return static_cast<const _Pred&>(*this)(__x.__cc.first, __y.__cc.first);} _LIBCPP_INLINE_VISIBILITY bool operator()(const _Cp& __x, const _Key& __y) const - {return static_cast<const _Pred&>(*this)(__x.first, __y);} + {return static_cast<const _Pred&>(*this)(__x.__cc.first, __y);} _LIBCPP_INLINE_VISIBILITY bool operator()(const _Key& __x, const _Cp& __y) const - {return static_cast<const _Pred&>(*this)(__x, __y.first);} + {return static_cast<const _Pred&>(*this)(__x, __y.__cc.first);} }; -template <class _Key, class _Tp, class _Pred> -class __unordered_map_equal<_Key, _Tp, _Pred, false> +template <class _Key, class _Cp, class _Pred> +class __unordered_map_equal<_Key, _Cp, _Pred, false> { _Pred __pred_; - typedef pair<const _Key, _Tp> _Cp; public: _LIBCPP_INLINE_VISIBILITY __unordered_map_equal() @@ -428,13 +424,13 @@ const _Pred& key_eq() const _NOEXCEPT {return __pred_;} _LIBCPP_INLINE_VISIBILITY bool operator()(const _Cp& __x, const _Cp& __y) const - {return __pred_(__x.first, __y.first);} + {return __pred_(__x.__cc.first, __y.__cc.first);} _LIBCPP_INLINE_VISIBILITY bool operator()(const _Cp& __x, const _Key& __y) const - {return __pred_(__x.first, __y);} + {return __pred_(__x.__cc.first, __y);} _LIBCPP_INLINE_VISIBILITY bool operator()(const _Key& __x, const _Cp& __y) const - {return __pred_(__x, __y.first);} + {return __pred_(__x, __y.__cc.first);} }; template <class _Alloc> @@ -655,8 +651,6 @@ {__nc = std::move(__v.__nc); return *this;} ~__value_type() {__cc.~value_type();} - - operator const value_type& () const {return __cc;} }; #else struct __value_type @@ -673,12 +667,10 @@ template <class _A0, class _A1> __value_type(const _A0& __a0, const _A1& __a1) : __cc(__a0, __a1) {} - - operator const value_type& () const {return __cc;} }; #endif - typedef __unordered_map_hasher<key_type, mapped_type, hasher> __hasher; - typedef __unordered_map_equal<key_type, mapped_type, key_equal> __key_equal; + typedef __unordered_map_hasher<key_type, __value_type, hasher> __hasher; + typedef __unordered_map_equal<key_type, __value_type, key_equal> __key_equal; typedef typename allocator_traits<allocator_type>::template #ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES rebind_alloc<__value_type> @@ -1321,8 +1313,6 @@ {__nc = std::move(__v.__nc); return *this;} ~__value_type() {__cc.~value_type();} - - operator const value_type& () const {return __cc;} }; #else struct __value_type @@ -1339,12 +1329,10 @@ template <class _A0, class _A1> __value_type(const _A0& __a0, const _A1& __a1) : __cc(__a0, __a1) {} - - operator const value_type& () const {return __cc;} }; #endif - typedef __unordered_map_hasher<key_type, mapped_type, hasher> __hasher; - typedef __unordered_map_equal<key_type, mapped_type, key_equal> __key_equal; + typedef __unordered_map_hasher<key_type, __value_type, hasher> __hasher; + typedef __unordered_map_equal<key_type, __value_type, key_equal> __key_equal; typedef typename allocator_traits<allocator_type>::template #ifndef _LIBCPP_HAS_NO_TEMPLATE_ALIASES rebind_alloc<__value_type> diff --git a/test/containers/associative/map/compare.pass.cpp b/test/containers/associative/map/compare.pass.cpp index f5e6917..aa4d599 100644 --- a/test/containers/associative/map/compare.pass.cpp +++ b/test/containers/associative/map/compare.pass.cpp
@@ -14,6 +14,7 @@ // class map // http://llvm.org/bugs/show_bug.cgi?id=16538 +// http://llvm.org/bugs/show_bug.cgi?id=16549 #include <map> @@ -26,4 +27,6 @@ main() { std::map<Key, int>::iterator it = std::map<Key, int>().find(Key(0)); + std::pair<std::map<Key, int>::iterator, bool> result = + std::map<Key, int>().insert(std::make_pair(Key(0), 0)); } diff --git a/test/containers/unord/unord.map/compare.pass.cpp b/test/containers/unord/unord.map/compare.pass.cpp index 814c40f..8979a3a 100644 --- a/test/containers/unord/unord.map/compare.pass.cpp +++ b/test/containers/unord/unord.map/compare.pass.cpp
@@ -14,6 +14,7 @@ // class unordered_map // http://llvm.org/bugs/show_bug.cgi?id=16538 +// http://llvm.org/bugs/show_bug.cgi?id=16549 #include <unordered_map> @@ -36,4 +37,6 @@ { std::unordered_map<Key, int>::iterator it = std::unordered_map<Key, int>().find(Key(0)); + std::pair<std::unordered_map<Key, int>::iterator, bool> result = + std::unordered_map<Key, int>().insert(std::make_pair(Key(0), 0)); } 